[Sherpa] Update Sherpa to 2.2.16 and add Recola#10200
[Sherpa] Update Sherpa to 2.2.16 and add Recola#10200shimashimarin wants to merge 5 commits intocms-sw:IB/CMSSW_16_1_X/masterfrom
Conversation
|
A new Pull Request was created by @shimashimarin for branch IB/CMSSW_16_0_X/master. @akritkbehera, @cmsbuild, @iarspider, @smuzaffar can you please review it and eventually sign? Thanks. |
|
cms-bot internal usage |
|
please test |
recola.spec
Outdated
| mkdir %{i}/cmake | ||
| cp %{i}/lib/cmake/recolaConfig.cmake %{i}/cmake | ||
| sed -i 's;^.*set(RECOLA_LIBRARY_DIR.*$;get_filename_component(RECOLA_LIBRARY_DIR "${CMAKE_CURRENT_LIST_DIR}/../lib" ABSOLUTE);' %{i}/cmake/recolaConfig.cmake | ||
| sed -i 's;^.*set(RECOLA_INCLUDE_DIR.*$;get_filename_component(RECOLA_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../include" ABSOLUTE);' %{i}/cmake/recolaConfig.cmake |
There was a problem hiding this comment.
@shimashimarin , you are copying %{i}/lib/cmake/recolaConfig.cmake in to %{i}/cmake ? is this needed? I would suggest to leave the cmake files lib/cmake path and run sed command directly on %{i}/lib/cmake/recolaConfig.cmake. If you really want cmake files in top level directory then please delete the one from %{i}/lib/cmake
There was a problem hiding this comment.
@shimashimarin , can you please take care of it. As expected , we see build paths in lib/cmake files https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0817e1/49482/external_checks/relocate/recola.txt
lib/cmake/recolaConfig.cmake:set(RECOLA_LIBRARY_DIR "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/BUILDROOT/6e292a6c44125ef340634bfdd66fa7ea/opt/cmssw/el8_amd64_gcc13/external/recola/1.5.0-6e292a6c44125ef340634bfdd66fa7ea/lib")
lib/cmake/recolaConfig.cmake:set(RECOLA_INCLUDE_DIR "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/BUILDROOT/6e292a6c44125ef340634bfdd66fa7ea/opt/cmssw/el8_amd64_gcc13/external/recola/1.5.0-6e292a6c44125ef340634bfdd66fa7ea/include")
There was a problem hiding this comment.
Thanks for pointing out this. I have updated it
|
+1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0817e1/49482/summary.html Comparison SummarySummary:
|
|
Pull request #10200 was updated. |
|
please test |
|
+1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0817e1/49494/summary.html The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic: You can see more details here: Comparison SummarySummary:
|
these differences are due to EMTF update |
|
Hi @smuzaffar, may I backport updates to versions CMSSW_14_X and CMSSW_15_X? These updates should be helpful for some Run3 sample production |
|
sure, if these changes are need there then feel free to open PRs for earlier release cycles. |
|
hold I want to have a discussion about Recola privately. |
|
Pull request has been put on hold by @makortel |
Enhance_Factor.Recola1for 1-Loop Amplitudes computation and interface to Sherpa.Recola1could helps on Sherpa NLO diboson simulation.